more hacking on mjolnir :)