Wrap is now done, remove it from TODO!