#688 Adds more template blocks

Fixes #688