Commiting to see where I'm at after some rewiring.