Enter now cycles multiple times

Also, it seems to be ignoring checking for the outer boundries of the window.
I'm going to assume recalling the Map constructor is a bad idea.