Preliminary work for #112
-Need to actually see if charsets work first...