Added extra fields to first table, preperation for raw data table underway