refactor things with a convenience method on mustache
ensure that if they increase we include them
add a second test