lots of cleanup. I think we have a v.1