Add solution to bonus challenge