Solved Problem 6: Make it Modular!