Added working stuff
Merged stuff