Put 2d function in their own header