Finish implementation of model