Tidied up the coontrollers so they don't accidentally share commands