First version working. Doesn't quite match sample answers in handout?