Commit to clear old garbage and re-organize thoughts
Resolved merge conflicts