Added Mouse Support
Resolved conflicts