Parser needs re-write.

[jaredpmclaughlin]

The parser is quick and dirty - and it shows. This needs encapsulated and improved.