Wip calateuth wusui

Please use underscores (_) instead of dashes (-) in task option names; it maps to Python variable names more obviously.