ok I think I am done, now I just need to wait for Shikaru's approval :D