Started moving some generic utilities into a separarte module.