Another test

I haven't commited the changes yet. Everything is in my local copy still. I am making some large improvements and want the code to settle down a bit before I make another commit.