Merge pull request #856 from ahomatthew/develop

Develop
more table stuff