crossed branches :(  chaos ensued.  tests fixed