Another iteration, fully functional but download is very slow