Final Commit with network stuff working