in theory this cleans up the adding alias situation a bit...and reduces the
number of templates...