Change to adding the Context files by iterating through them

I am really not going to be able to diagnose this remotely. Just have to
see if it occurs elsewhere and hopefully someone can play with it and see.