adding a slightly broken version of the phase 2 architecture