change from referenceing Url's to Uri's
remove a bunch of casting agsint the dynamic object's fields