Added but unfinished: column and row headers.