still fiddling with Touch

Working on getting it integrated.