Lots of changes. We're now using SMOF as a default, and just using the hooks to modify. Yay.