Moving Mamba monkeypatched code into Storm. Solves #34 and PYM-9.