Added in loading of extra table data, still has bugs