starting a pretty significant rewrite of a lot of scope data