Added more TODO's
Clarification
found a way of refering to adjacent squares.
Merge commit 'ad1ec6a0dbc08af6a74a1970eb0959eff489fb12'