More changes to the SA. Next, I think we can start pulling some of it out. Refactor time!!!