Branch/kinetic touch

@eric79 
I never even got around to testing the touch, but these changes need to be made regardless