More tweaks.  Deployed this schema to test db instance.