Complete all of TODO [fix #1]