more pickup functionality - testing soon