Garberus feature

This is a well tested feature that should go to master.