Add the binary export, so it's easier to have a preliminary look.
More cleanup