* WIP: rebase * Make nullable fields use pointers
* WIP rebase * Combine both SQL DBs * API and DB refactor