Implement PR from @stuntguy3000 into new command manager