This could/should be unexported?