begun bringing location to table model:

Need to re-make:  This is okay