Templates and changes to Collection

in-class 3/27