rewrote migrations and updated models