Began fixing up code to display the templated content