2D solution options and new sparse matrix builder, both in progress