Add method for fetching from the network
Add test for edge cases