More experimental changes and bindings.
Merge fix
Clean up merge conflict