Tables functionality complete