phase 1 seems to be working
setting up phase 2 in new branch
phase 2 working