refactored a wart out of HOComputer, and cleaned up a bunch of code.