refactor party and fix compile errors
refactor party and fix compile errors

sundriver/RAM,dave-cheong/RAM,dave-cheong/RAM,atogov/RAM,atogov/RAM,sundriver/RAM,sundriver/RAM,atogov/RAM,sundriver/RAM,atogov/RAM,dave-cheong/RAM,dave-cheong/RAM