WIP: Continue trying to break things apart.