First pass at controls.  Probably bugs.