Whole rewrite of Touchscreen App