added the rest of the rayo parser