Work on better char support (unfinished)