Fixed up code to compile with the new network containers. More testing to come.