Merge backend -- new list feature and cleanup