added rename, mark, and resolve fold fns
starting to add sexp (now rotted, sigh)