Added some in progress 2d histogram refactoring.