Significant refactor of module

Yes, it should outputs extra logging. (Also compilation was failing previously with it on.)