new todos and whitespace
Paired down for early launch