we'll do this synchronously for now until this gets cleaned up.