added rag's shit + tests