First pass at key code support