Quick hacks to get basic controls working