refacotred to more closely align with party model