Added a few more templates and completed the handlers.