airgap/remodel

unified db/api models