Progress on #25