WIP - do not merge

@adamjgray thoughts?