split out proponent and opponent actors
remove unused code
split out actor classes