working towards networking complete
merged