More core files and thinking.
Merge fix