Still buggy. Need to resolve the list drag & drop bug.