Finished v1 of URI parser