Module multiple times

I think this is done. Let me know if I've missed anything...