Fixed populator and added simple uploader