Midway to finishing version browser refactoring