Fixed #13, start to move parsing code

Line 57/42 was not incorporating input from next_to_evaluate().