Working Task Controller and Improvements to Build Controller