Milestone 1

-Huge logic changes