Added or rendezvous class. Probably still too complex but functionality works surprisingly well.