beginning schema refactor