Finished reworking of model architecture