Architecture cock-ups...