Broke some code, working on fixing bugs