Working on getting all optimization scenarios working...

...still one bug.