Got Program Working Again

refactored enough to make the program work up to victory.  defeat still
needs work.  I also want all the different functions to only return or
take as input character objects instead of those and character names.