First trial of moving the existing table. Also add an empty clean up function, and fix... something. I forget