ENH/WIP start to work on adding 2D support