Initial commit of 2d solver, which still needs to be debugged