Added mouse support
Conflicts resolved