Continued datatypes. Build still broken.