move to single task or instance in correct place and use resume aswell, still needs refactor