Refactor: Slowly trying to break apart this mess of mutation