Well, yes, the module actually needs to be completely refactored....