Use thimble

WIP, with some review points so it doesn't get too off-track.
This changes the interface. That should be fine right?