Have added attributes to Model. Might shuffle these off into their own module, to keep model.rb itself slimmer.