Begin adding CAD api