Got all of the collection view stuff working
Weirdness
Merged master
Changed up look and feel a little
Merge remote-tracking branch 'origin/collection-view'