Finished implementing tables