Finish exercises 3.5 minus postgres