All roads lead to merge
Reverting to older working commit
Fixed crash, moved registerTouchArea and added deregisterTouchArea