Which proposal had a two-house legislature, one with equal representation for each state and one with representation based on population?