Reworking proposal

First updated draft of proposal