Refactored the way parser works...
No need for it's own class? works fine like this...