Begin refactoring of base_monitor and templates