Baseline architecture done