not there yet, but making progress
about to go to new branch