Added weights.  Old unit tests pass.  Weights untested.