Updating Ch1, adding templates