wip on rinle, some reorganisation