Undoing table stuff for now, so it can be redone.