started to rearchitect. began more design