Re-merged base64/header stuff