WIP: Starting the rename of event->input, which I'm still not happy with.