4/4 todo testing, fixing