Started major schema refactoring. Massive test failures.