refactor for 2
wip
built files and browser tests