full field population when editing, cleaned up comments and log calls, MAJOR MILESTONE