Finish chap 5
Update migrations