Incorporate new add/edit template and remove functions that are no longer needed.