Improvements
Added mouse support for testing