tests are working. new model rewrite is solid.