OMG WORKING
updating with text manipulation working
fixed text
fixed conflicts