- moved code around a bit
- added per class is_active methods
- added logger