Re-adding the minimal example.
I love this too much to have it removed :p
Fixed things that were removed after merge