Added Controller Support

turned off by default.