Start making commands use the right stuff