Added the stuff from the proposal.