refactor of multiple monitor services into 1, and of tests.