Added almost everything
Lots of things
Lots of bugs