Elute rescue 02

This is a specially prepared branch for @elute to merge in order to include mmol with out recent updates.

Github should recognize it as able to merge, but does not for some reason; I'll work with @elute to get it sorted.