Merged the two serial files,
Fixed the merge to be dual OS compatible
Actually fixed the merge this time, christ git can be tempremental