Updates to the Table Models

These were fairly significant changes to a lot of the analysis forms. Possible introduction of bugs.