I'll try to finish up the CS (among other things) either tomorrow or after a nap.