Added framework for pickups, still not quite complete