Fixing up the API for monitor, now to test on the device