amethyst: initial commit (replaces mjolnir)