Converted to DataMapper! Ahhhh, so much nicer.