First pass at DB
Merge cause git so dumb