Added model and migration files.
Fixed merge