TO DO done
Finish writing comment and move fields