still smoothing out the architecture