got the test_delivery_model tests working.  Have almost all the delivery functions working
got pack to a passing UT state...Yeah!