edited some classes that had conflicts. added publisher and subscriber
classes