going to try a re-write with a new branch