Minor progress on model