Changed how sub commands are invoked and made it clearer.