More changes
Think I have a working solution...