More work on tables and initial work on write up