Adjusted a lot of old parser code and structure. Began let work.