More work, but breaks test_stamp.py