Refactor and working towards downloads persistence.