Start work on using contact info tables