Further fleshing of models, lazy loading started