Use thimble

WIP, with some review points so it doesn't get too off-track.
Yes :( Clock is, so maybe contributing this would work.