More stuff. It's shaping up. I knew the api is there, it's just vintage.py et. al. do not appear powerful enough