New TODO: change from underscore to lodash