slight program overhaul

this change should change the program closer to the original and be the
first to start moving in that direction