Fyrsta commit a nyju branch master-calculator