Add OX implementation
Minor change
Add tests for OX