z
merge part 2
merge part 3
Merge part 4
Merge part 5
Merge part 6
Merge part 7 (last)

All the new code was merged back, build was fixed, app even starts. So
that's cool.