Getting subcommands working, other Thor stuff, system_timer fix