Completed 5. Make it Modular