Initial crashless build
Mostly working
Catchup
Beta
Merge fix