added bit more meat to templates