Post Jans advice changes.
This completes table handling until we add pagination