switched to cell list
fixed segfault
added cells
merge