remove the templated approach to putting in markup