Get rid one of the getRegisterNumbering. Also add D16 - D31.