Adds cross PZ support and the ability to switch parties