Added the more fleshed out proposal