Massive refactor/automated clean up
MERGE CONFLICTS YAYYYY