Move all state to request. Closes #1269