Nearly finished adding all of the data types