Added some class definitions and did some refactoring with mouse states