Updating to use my own serial class