Finish bringing models controller/view up to date