Begin to Update Application to Use Tables