A couple more todo items. Enough for now.