Expanded parsing logic.
Fleshing out logic very gradually.