John Frizelle wip pr attached. feel free to review if you have some time. Have a couple more changes to make this morning to finish it out.