now using other cells
refactored to include matrices
Added neighbours matrices
new classes
test
try again

It seems there are unmerged changes upstream - but let's try anyway.
Merge remote-tracking branch 'origin/master'
just for a commit test