Structure - parts of create statement/table still need to be fixed