Adding fixtures and migrations to this merge