prepping to merge matt's template stuff