A little more progress did some backpatching so I could test what I've
done so far. Had to go back and fix the problem I was having with scope