You're really improved on my initial work - mind if I change cl.net to point to your repo as the canonical version?