Finishing touches on the touch. Most functionality done now