The Viable Two-state Solution?