Carrierwave

I'm sure this branch will need some TLC when I merge with master.