Merge - Dima and Anton versions. Still has db migrate problem