Start working on the right handling of the mustache sections