More major improvments. Parser now works.