Start on collections and creating uploads
S'more angular
Wrong inheritance
Merge pull request #11 from farski/master

Catchup