First commit of full api verification