Cleanup + Lots of work on item2
Some cleanup + fighting git
Lots of work on item2