Merge MVP!

MVP was forked to avoid stepping on master -- but we now have an almost-finished MVP and master has been untouched for months. So I'm merging it.