got refactored system working again