firs refactor of the builder manager