Cleanup, began writing packet handler