Near final commit

Working on touch support