Work on stuff
Fix merge