Jnf/proposal review

WIP