Merge branch 'refactor_buissiness'

Refactoring of the buisiness accounts logic.
Beacause it causes deadlocks as it was.

Author: Ivan Stoev