Minor changes
Fixed small bugs
Minor changes
Parent cell not working
Working out merging bugs
Implementation working