Begin reimplementing multicast support