Should logging be here?