Templating cleanup and organization
Mechanics in place; building out rotating_list more