added more atdd and mustache for templating system