Finished the refactoring, time to implement the BUD completely