Final edits, still waiting on tables