just added som comments for what we need to do in the future. I will get to it eventually...