COde cleanup
Added polylist templates
Added polylist templates