Feature 3229: Working on the monitors, have to check in some stuff un-finished to work on my dev env. at work