Added everything I noted in the exercise. Now I'll have to think for myself.