URL handling causing issues, I will deal with this later