All of the above..
A delegate from Connecticut, Roger Sherman, proposed a two-house legislature, consisting of a Senate and a House of Representatives. The Senate would have an equal number of representatives from each state. This would satisfy the states with smaller populations. The House of Representatives would include one representative for each 30,000 individuals in a state. This pleased states with larger populations.
This two-house legislature plan worked for all states and became known as the Great Compromise.
