Finish model implementation (in principle)