Added in hack to get touch working
Cleaned up touch patches a little but still very sloppy