Work through for first preview
Correcting some issues with npi_schema.sql