Huge refactor. Much seperation. Ore dictionary in some stuff.