textinput modal and stuff
merge