Reorganise state and flow, push more things in state and out of presenter