As I understand it, the Peel Commission Report (1937) referred first to a 'two-state' solution, but included maintaining a British 'mandate' that would include Jerusalem. Perhaps a tripartite solution might be a way forward: one nation for Muslims, one nation for Jews, and a 'democracy of the willing' open to all people that would include Jerusalem.