Things seem solid will create a branch from here for more work, then merge as needed.