added some templates, working out some minor issues...