Started separating view and model