work on schema and a bunch of hand massaging to get the yaml looking right(er); work on #33