move all the pieces around (in storagemaster.py)
comment out debugging