Began implementation of touch, some code cleanup