More patterns, more function bodies