Removed un-needed classes, implemented Relay Class