It's *really* almost working.
Merge remote-tracking branch 'origin/monitorClass' into monitorClass

Conflicts:
	monitor.js