Need to remove logging from API...