Adds tabular data

Updates conversion names to be a little easier to work with