Feature/implent bu system