Finish getting the model-adapter working