Moving towards an actual Parser implementation