initial osbridge refactoring