1 step forward, 2 steps back

Redoing all of my code, aiming for something simpler and not so
contrived.