Refactored party members
Added types for parties. Closes issue #1