Refactor error handleing
reduce argument passing
updating test coverage
Refactor feed sniffing