Started adding parsing