Rereading this determined to do it properly. [Writing all the missing tests, etc. Doing the persistence with nHibernate 3, and so forth.]
Taking notes from now on - only for me!
Stranger: - if you come here and accidently read this - too bad if it doesn't make sense because it's only here for my benefit.