Move touch detection to bootstrapper