Radical changes, still in progress
Conflict fixing and merge