Reconciliation done. TODO: Write migration for new db schema, code todos.