Revert "Revert "Pimba!""

This reverts commit a6bbd107a4d0965294e7dc2a19058d26aaad2eec.