Works with new command manager.
Nothing is actually converted over yet, because I'm very tired, but the framework is there and we can use it whenever we want to.