Prepping ellipsis version refactor