Initial heartbeat support.
More namespacing but mainly random acts of Alice