Getting closer to working optimizer...