Condensed into one app, added a heartbeat