local stuff
merge
break apart
handle going offline in the middle of downloading something
better name
Merge branch 'simple'