Rework annotations

src/Dodge/UseAll.hs

@@ -1,6 +1,7 @@
 {-# LANGUAGE TupleSections #-}
 module Dodge.UseAll where
 import Dodge.Data
+import Dodge.Tree.Compose.Data
 
 import Data.Tree
 import Control.Lens
@@ -15,8 +16,11 @@ toOnward s rm
 toOnward' :: Room -> Maybe Room
 toOnward' = fmap snd . toOnward ""
 
-rToOnward :: Monad m => String -> Tree Room -> m (Room -> Maybe ([String],Room), Tree Room)
-rToOnward s = return . (toOnward s ,)
+rToOnward :: Monad m => String -> Tree Room -> m (MetaTree Room)
+rToOnward s t = return $ MTree s (tToBTree t) []
+
+tToBTree :: Tree Room -> MetaTree Room
+tToBTree (Node r ts) = BTree (_rmName r) r $ map tToBTree ts
 
 toClusterLabel :: Int -> String ->  Room -> Maybe ([String],Room)
 toClusterLabel i s rm