Beginning of ore refactor

Going to go slow on this one to make sure I don't break anything.