Update: Full generator Refactor,
Seperation by concerns