cleaned up initial code, time to move on