Stable Before Party Redo

Stable version of the prototype before the party feature is redone.