Restructured monitor runner, code is now much cleaner