Hack out lots more bits... not self-consistent yet.