begun adding laziness and implicit feature upgrade to deliver2.py