Added table-view stuff.