Added comments and templates for Justin