Add basic templating gimmick
Some changes to the gimmick API