TO DO: Upgrade to the new input system.