Reimplement download handler. Close #3