Setting up CSLA changes for functionality.
Finishing up CSLA work for new functionality.
Revert "Finishing up CSLA work for new functionality."

This reverts commit 245815f7dd0e40f6cca1514222746c9a0dfa7be8.
Revert "Revert "Finishing up CSLA work for new functionality.""

This reverts commit 1254f229ba0ce7c57470270dce3dcc80f6bfaa87.