I think I completed Excercise 1.
Ex.2 looks good.