I'll have a CS up by tomorrow, cap'n