I guess what I mean is I think we should do this in a different method (as part of dispatch)... then let the original code here work off the model.