New style edits

Merge child branch into working Master branch. A lot of shit going on.