Pickups and integration changes

Added pickups rough integration. Note the changed templates in the list.