Added a couple of templates and made initial search work