Ongoing refactor, additional commands.