wip
wip
fixed submitting a text
texting works
solved merged conflicts
solved merge conflicts