adding text_pins, halfway done
text_pins working
fixed merge conflicts