Work in progress for ToddM testing.