@jdsteve2 FYI: Type handling has changed in the commits leading up to this to allow for atomic operations