fix up, add silly test, and make into own module.