Still working on merging - currently broken

Gotta work on other stuff in interest of time