How implemented does the state system need to be before said refactoring will happen?