Parser now considers whitespace
Fully implemented parser