re: #398 jcm

Finish it now or deal with it later.