Lots of cleanups, goodbye to the list element.
merge