useR!2014 commit

Make the functions actually work like the talk.