work-in-progress towards separating out the infinitesimal from the modes