WIP on merging lots of stuff