WIP: Serial overhaul