Overhaul Part 2

Lots of updates