couple more todos