Finish bloc2 templating