Working initial build.  Now to test...