Get specs working; need to rework schema
Begin rewrite of schema, with (ugh) explicitly passed-in core