some progress with the refactor effort. Operations as parameters are also being tested -- so far so good.