Is this master?

TouchInput is now fixed... for now....