Code Review PR

All these lines should probably be a method in the Party model.