template updated
updating categorical data models
clean up
namespace clean up