Added more of the Net implementation