[WIP] merge most legacy progress, without testing, yet.