Started implementing templates into the addhandler and the tests.