Complete refactor of Parsing solver code in preparation for .nl files