Issue #14: Re-added Joysticks