I've made the changes to Chris' CS so I'll get a post up later tonight.