Some work done on the front-end upload