first commit for proposal, i think