First changes to spoon-fork.