Enhancement to support sound transit build.  Many TODOs left, and more
testing.