Finish of varugrupp

Lots of if statesmesnts to add functionality of varugrupp