Marketing module rewritten (mostly)