Across the Universe. Fixes #121. Fixes #53.