#21 Adding NetworkManager