Continued datatypes. Build now fixed.