Download observing instead of intercepting

#247 - Sending just for code review... do not merge yet! :)