Switch to lodash properly