Few functions still incomplete