front-end and back-end brought together (download implemented too) Change-Id: Ic451459626f5fbbfbf7a04e09204cb8f62c8f340