Beginnings of ore refactoring