Added stuff
Finished
Fixed merging problems