finished command decorators
Finished converting modules