Use thimble

WIP, with some review points so it doesn't get too off-track.
Fixed in 1385061