Adding extra functionality to complete joystick integration (work in progress)