add that parsing stuff