Further changes to do task. Added the whole of rapprentice to this so that package is self-contained and we can push changes to other code.