Small batch of work - shaping up the architecture still.