Final Changes To Command Manager

Hopefully