Initial work on mouse/touch control