wip

WIP PR for discussion.