Still testing api.. updating model and views were applicable
Fixed conflict