getting architecture straigthened out