trying to make the code work :(. code commented out in codeupload, base, and dash views.
fixed merge conflicts