small steps towards working uapi mappings