Added beginning of new tool framework.