Added paperclip
Updated models to incorporate associations