Refactor. Debug
Add task picker for builder