Tables v2 c

This will be addressed when we add paging.  This code is a stop-gap.