TO DO done
rename field, finish writing comment, move field