My bad, more todo stuff