Adding pickup/drop

…needs some polishing