Network now OO, some cleanup still required