upload functionality and cleaned up downloading hierarchy
committing dumb conflicts
dumb conflicts