Beginning of ore refactoring