Did a bit of cleanup, and now debating about whether or not its neccesary to have an old vs newstate, I suppose I'm wondering if we'll gain much runtime from it. Something to think about over night