SFD-7

This is an initial commit for the changes to Oscar needed for Spatial Fusion Discovery.