Started adding code to cope with presence channels.