Added first cut main parser