Working on jadefying our template