Work toward #18