redid all lol
cleanup
cleanup !
data are mostly working