Added TODO, removed hardcoded urls (mostly)