For the sake of simplication I've removed the proposal code but it has side effects and needs to be put back