* move the margo methods into the correct place