Reverting Quick fix in favor of a more thorough solution

Reverting Quick fix in favor of a more thorough solution (that needs to be in the model, not the view)