Initial merging of UART code, still broken though