Added some semblance of a front end
switched keys