Some progress on converting across to using orienteer