Use thimble

WIP, with some review points so it doesn't get too off-track.
Yes. It can be different PR. I am sorry I should've mentioned that.