Second commit. New templates and format