Here is the merge request of what I have been working on into the moduletest branch. Should largely be the same.