Half of this PR is now UART and I don't understand why.

seems I did not commit those and they got deleted! lol added them correctly (this time)