Added lots of touch stuff