More groundwork

No added functionality yet, but some methods have been fixed. Actually
not sure why OnTouch method isn't working yet.