There are changes stacking up that require me to break things. Instead of going nuts on stability I'm going to attach them here and do them when it gets heavy.