Preliminary Interface Changes and Experiments
Fixed Merge