Feature gifts

Implements #1209