wrangle between surf and browse context
Merge violasong changes