Model and controller finished