grumble... seeing if putting everything in one file changes things...