This should be the latest, with the input handlers working the right way
now