Updates for URLManager and networking
Addition of TODO