New extension points for blender. Allow subclasses to extend template.
New deisgn clean up
Fix compile errors