#7: Fix up the architecture