Remade controllers, should have been other names
Reusing github, pushing changes