Throwing out intial class code.. rearranging functions from main program into classes