Keep this as a library, why move it?