Make it Work! Updates checkSerial and refactor