Fantastic! I can't say I'm enjoying the source code much but nice things are often quite messy under the covers. Nice work!