Updated solver.
Updated code base. Parser now works.