Lots of work on reporting, CLI, etc.