Lots of changes
Hopefully fixed merge