Moved more code into cell hud inner class.