[WIP] First swing at issue 107