initial code on #25... need to complete #25 to get unit tests passing on #24