Moved contributor logic to model
DRYd up contrubutors method and tested both paths