Major structural edits
Fixes merge conflicts, the head was most accurate