Tinkered with maprunner