Flesh out some todo items.