I'll take a more thorough look at the code tonight too ...