Finished CS refactor.  Better use of closures and object creation.