Complete rewrite
Make server subcommand
Completed marv create, build, watch