Did a lot of stuff, but have no idea how to merge with master