Moving logic into deeper, shared code
Continued facting ino lower-level code