Controllers added, some logic from task removed to controllers