more of the way through rearchitecturing