[DO NOT MERGE] Initial commit of refactor. Still contains old code.

Not understanding what the No code comment is for.