(realize this is just copied code - just looking at it more closely as we are putting in core)