Updates to feature specs and CLI
Huge commit with lots of stuff.