Table generation now working.  Still needs polish.