Fix methods. Begin working on subcommand system, finally...