Merge pull request #1098 from ahomatthew/table

Final stuff for table.