took 6 hours to delete one line of code
merging unti 6
Merge branch 'Andrew'
Fix merge conflicts
Hopefully a fix for the coming back online