With a couple fixes verified to work with .apps on Mac