Beginning of ore refactor