Just a quick TODO in Network