(#52) axHeartbeat, axVisibilityService (work in progress)
(#54) axVisibilityService (work in progress)
(#52) Cleanup