Bug-fix:

 - Fix BCs in 2D instead of accumulating to account for global points
 - Might require a re-look