Working on KeyController, final commit for tonight