Working the first TODO in.