Closes #23 (moving Parser to main program)

I think it's now 20% more awesome :D