Wip/revert dev

Reverting dev back to working copy. -TJ Watson