WIP re-structured table initialization