IncludeUrl: Make it a function and more small fixes
TEMP