Doing too much in payment branch. Changing User/Order model.