7 Commits (feature/tokenbalances)