Add draft mauser, shift parser from crm, add headers