finished the schema refactor