Ellipsis functionality update.
WIP
WIP