WIP, but first start of proposal.