Agreed, moving this out of main is a good thing!