I have no idea what i changed
Merge branch 'wintouch-debugging' into working