Got the module construction logic working better but using a Dummy class