Did some more architecture work