Preparing things for HackFMI 3.0