URI implemenation... Need a clean dataset to test this on.