Refactoring.
Type safe Uri:s.
Error handling on illegal methods.
More methods to test for in illegal methods test.