Some more munging and tabling in this commit