re-organize some scratch work