Second draft, w/ tests