Copy/pasting is bad, mkay?

Really need to give the Modules a refactoring overhaul to reduce copied
code.