Selectively pick stuff from Claudio's experimental tree.