Added basic fetcher code back