Includes all the changes needed to support presence

Changes to support presence.