reworked database schema.  11 tests passing