Added controller support and input system