Move function, remove TODO