Even more Risiko functionality implemented