started working on analysis measures - didn't finish though