Model test written
Almost created the whole model layer for this feature!