updating paper
mergin changes
dylan updating stuff
pushing final