Moved keyhandling into appropriate class
Merge pull request #28 from addisonbgross/max

Moved keyhandling into appropriate class