Fixed parser; now to add on...