Ok, updates CS. I think I'm done. Let me know what you think.