Working toward #27.