Uart

Need to merge it into master to branch to work on task killer
inconsistent tabulation - use 4 spaces.