finishes first implementation of basic model structure