Merge pickup to draft

Fixes #19