New task window working, merge ready