Add 2D board definition
Add 2D collapse function definitions