Added two more commands, some parameters and cleaned up everything to use some more IoC goodness.