Added Eiriks code so far.