finish up support for arbitrary party sizes