Get some more controllers working