Test and integrate pickup

Works! :)