refactor lots of code, add account bundle