Updated urls and added todos

Eventually this whole thing needs to be rewritten, but this will hotfix the url problems.