First steps in refactoring the SA.