Added more stuff to the rayo parser (Still WIP)