Some TODO:s added