Move to new tool/template system