New upload

needs testing for new functions - talking to Prof. Kuhail to get more
details on 6/24