This checkin is a big HACK just to be able to get touch working.
I will clean/refactor ALOT after I move ahead to the current nix.