ENH/WIP start to work on adding 2D support
Merge pull request #1 from tacaswell/csx_comm

ENH/WIP start to work on adding 2D support