working on heart pickups
merge