Basic structure.
More housecleaning.
Merge branch 'master' of github.com:gvsboy/heartbeat