Modified to have as I envisioned. The framework new support real modularization