[@Themerlinhawk] Updated my CS, please take a look at it and let me know if anything else should be amended.