Adding TODO finish criteria list