in the middle of a big ass rearchitecture