Refactor shiftBoard
Refactor shiftBoard down to one set of loops