Counter proposal

WIP - For @jweiss' review