Massive pick-up system refactor broke everything