Use handlebars, not rivets