Great guide!!! Thank you!!! It is not very difficult to replace the keyboard / top cover. However, for some reason the computer didn’t immediately started, I had to reset and connect to power supply and then it started and works fine.
There is a small metal part that falls off once the display cable screws are removed and you try to separate the display from the top cover. Just make sure you put it back correctly.
On the 2016 model the USB-C is actually one whole part and can be removed once the display is removed, unfortuanatelly.