Added lots of stuff
moreeee