Attempt to clean up serial things and implement handling