working on templating
fixed conflicts. renamed file