Moved all code into a map for state changes
Removed right mouse down method