Move most of the Computer into GenericComputer.