Some more changes - trying to get the model and adaptors right - challenging