Fleshing out assignment #2