Active record branch

migrated