added commenting
starting removal of get_fields() parameters