New options format

These changes complement #2. Just posting to a PR so people can follow easily, still in progress.

cc @etagwerker @robotvert