More work on tables, mostly converted but I've reconsidered the implementation