Fixing our architecture… not done yet.