Complete rewrite of the module!