FYI. After 1.5 lands and the dust settles, I intend to look at refactoring buildout pretty significantly, primarily to make maintenance simpler. Jim -- Jim Fulton