Back-factored into working state, fix later