First cut of optional parameters. Not all tests are passing yet.