working on 2d analysis, added appropriate tests for current progress