Two-way cell linking
Lot of modification on the core.

Cleaner but still not working