I'll keep working on my CS tonight.  Expect a more final version soon.