Refactor, Sort out the 2d case
Rework tests