Did a lot of style work
Merged branches