Wow, this is great! I have a feeling I'm going to be sinking (no pun intented) a lot of time into the new version!