More portions of this refactor. Lots of things in motion.