100 functions
Merge branch 'ryan'
more coverage