Shallow pg_dump a bit
Combine pg model files
Initial work on items
Update for Types