wrapping up stuff to move to ~Sites for local testing