Added parsing to the mix!