MASSIVE CHANGES

Fix Pickup later